Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Set current project name for EventListener events. Change-Id: Ieaa3fd0a80b08ad2e0703e51864531a502e1894e